Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 24.2 into dev. #19273

Merged
merged 10 commits into from
Dec 9, 2024
Merged

Merge 24.2 into dev. #19273

merged 10 commits into from
Dec 9, 2024

Conversation

jmchilton
Copy link
Member

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

ahmedhamidawan and others added 10 commits December 4, 2024 13:42
@ahmedhamidawan
[24.2] Build collection only if populated in collection builder
22179d2 
Fixes galaxyproject#19243
@ahmedhamidawan
remove commented out duplicate function in paired list creator
ae0ff75
@ahmedhamidawan
use confirmation dialogue to still allow empty collection creation
1c9e972
@dannon
More protection around redirect cookie handling for psa.
5f83406 
Sets expiration to 24h, clears to default if next isn't provided, and
clears after use.
@jdavcs
Fix version number
5ee4dfb
@jdavcs
Merge pull request galaxyproject#19254 from jdavcs/24_2_fix_version
16fe9c5 
[24.2] Fix version number
@mvdbeek
Merge pull request galaxyproject#19251 from dannon/login-redirect-fol…
316ac2e 
…lowup

[24.2] Login redirect followup
@jmchilton
Merge pull request galaxyproject#19250 from ahmedhamidawan/enforce_it…
0f84879 
…ems_in_collection_builder

[24.2] Build collection only if populated in collection builder
@jmchilton
Merge remote-tracking branch 'origin/release_24.2' into release_24.2_…
8122566 
…merge
@jmchilton
Restore dev to version 25.0.
5909843
@jmchilton jmchilton added the merge label Dec 5, 2024
@jmchilton jmchilton marked this pull request as ready for review December 6, 2024 14:12
@jmchilton
Copy link
Member Author

This has a non-merge commit where I fixed the version in dev so I'd appreciate a +1 here so I can merge this.

@mvdbeek mvdbeek merged commit f38e13a into galaxyproject:dev Dec 9, 2024
52 of 58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area/UI-UX merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jmchilton @mvdbeek @ahmedhamidawan @dannon @jdavcs